xen: arm: remove PSR_MODE_MASK from public interface.

This is also defined in sys/ptrace.h on arm64 which breaks the tools build due
to multiple definitions. I expect this is really a bug in the kernel and/or
glibc but we don't really need this symbol in the public headers, at least not
right now, so move it into include/asm instead.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S
index 36114273d7c940b519e5a6c5c3b4cb76954226ac..76814dd5ebe0b1826eeb22bb4bb69e6e3d0c0579 100644 (file)
--- a/xen/arch/arm/arm32/entry.S
+++ b/xen/arch/arm/arm32/entry.S
@@ -1,5 +1,6 @@
 #include <xen/config.h>
 #include <asm/asm_defns.h>
+#include <asm/regs.h>
 #include <public/xen.h>
 
 #define SAVE_ONE_BANKED(reg)    mrs r11, reg; str r11, [sp, #UREGS_##reg]

diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S
index 9d38088c8525081f6d3270078c63d8dac8f6fb0d..5656f4565b18b53f4eb76bb4b8cfd54e3fe96cb9 100644 (file)
--- a/xen/arch/arm/arm64/entry.S
+++ b/xen/arch/arm/arm64/entry.S
@@ -1,5 +1,6 @@
 #include <xen/config.h>
 #include <asm/asm_defns.h>
+#include <asm/regs.h>
 #include <public/xen.h>
 
 /*

diff --git a/xen/include/asm-arm/regs.h b/xen/include/asm-arm/regs.h
index 079c0ca47bef6eaf32539e340433a89ccf6e8090..0130b94e75648663ff1a9032b95ceef109c53b23 100644 (file)
--- a/xen/include/asm-arm/regs.h
+++ b/xen/include/asm-arm/regs.h
@@ -1,6 +1,10 @@
 #ifndef __ARM_REGS_H__
 #define __ARM_REGS_H__
 
+#define PSR_MODE_MASK 0x1f
+
+#ifndef __ASSEMBLY__
+
 #include <xen/types.h>
 #include <public/xen.h>
 #include <asm/processor.h>
@@ -42,6 +46,8 @@
  */
 extern register_t *select_user_reg(struct cpu_user_regs *regs, int reg);
 
+#endif
+
 #endif /* __ARM_REGS_H__ */
 /*
  * Local variables:

diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h
index e44e90f7bc4c31a0817955389b0973e446ac89e9..746df8e69f062120a6bca969692635dc8975ae73 100644 (file)
--- a/xen/include/public/arch-arm.h
+++ b/xen/include/public/arch-arm.h
@@ -206,9 +206,6 @@ typedef uint64_t xen_callback_t;
 
 /* PSR bits (CPSR, SPSR)*/
 
-/* 0-4: Mode */
-#define PSR_MODE_MASK 0x1f
-
 /* 32 bit modes */
 #define PSR_MODE_USR 0x10
 #define PSR_MODE_FIQ 0x11